Conversation
Codify a strict branch-isolation rule for every new session so work starts on dedicated agent branches/worktrees, and document immediate recovery steps when accidental edits land on main or another base branch. Constraint: User explicitly requested never writing directly to main/current local branch Rejected: Keep existing softer guidance only | not strong enough to prevent repeat workflow drift Confidence: high Scope-risk: narrow Reversibility: clean Directive: Keep branch-isolation language aligned with agent-branch-start/finish scripts and avoid reintroducing main-branch exceptions Tested: npm test (46/46) Not-tested: GitHub markdown rendering diff
NagyVikt
deleted the
agent/codex/20260411-144118-lajos-edix-hu-no-direct-main-branch-edits-policy
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary\n- make and checked-out base branches explicitly read-only in AGENTS working agreements\n- require every new session to start with branch 'agent/agent/20260411-144234-lajos-edix-hu-task' set up to track 'origin/main'.
HEAD is now at 3f4f624 Document real VS Code repo layout and codex-auth pairing workflow (#19)
[agent-branch-start] Created branch: agent/agent/20260411-144234-lajos-edix-hu-task
[agent-branch-start] Worktree: /home/deadpool/Documents/multiagent-safety/.omx/agent-worktrees/agent__codex__20260411-144118-lajos-edix-hu-no-direct-main-branch-edits-policy/.omx/agent-worktrees/agent__agent__20260411-144234-lajos-edix-hu-task
[agent-branch-start] Next steps:
cd "/home/deadpool/Documents/multiagent-safety/.omx/agent-worktrees/agent__codex__20260411-144118-lajos-edix-hu-no-direct-main-branch-edits-policy/.omx/agent-worktrees/agent__agent__20260411-144234-lajos-edix-hu-task"
python3 scripts/agent-file-locks.py claim --branch "agent/agent/20260411-144234-lajos-edix-hu-task" <file...>
implement + commit
bash scripts/agent-branch-finish.sh --branch "agent/agent/20260411-144234-lajos-edix-hu-task" before edits\n- document immediate recovery path when accidental edits land on main/base\n\n## Verification\n- npm test (46/46)